dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 54ce11a 6efb972)

author	Glenn Morris <rgm@gnu.org>
	Sat, 12 Mar 2011 19:19:47 +0000 (11:19 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 12 Mar 2011 19:19:47 +0000 (11:19 -0800)
commit	09d9db2c4921cb2eb0974892164dd03d6bffdd80
tree	7165f97f16ea0eaab567db2a45f69d1cdf66bdce	tree \| snapshot
parent	54ce11a161cd756047fccdfc128dc0527692ea06	commit \| diff
parent	6efb972c00a9ea8ffa84118199aa59c2d3a3b50e	commit \| diff

Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/msdog.texi	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ebuff-menu.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/server.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/fringe.c	diff1 \|	diff2 \|	blob \| history
src/unexmacosx.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.